Removed possible breakage