Fixed the issue of casts not getting the whole expression

Fixed the issue of casts not getting the whole expression #404