Implemented the same_row fix for ember