Removed some duplicated behavior