Fixing the method to return the same shape!