Fixed to return resultant shape instead of original shape