Fixed "end" when not needed