Fixed atEnd