Begin() - End() bug fixed