Fixed bug that created extra unselectable objects

see: https://www.pivotaltracker.com/story/show/74385796