removed whitespace, fixed collision