Removed the whiplash on necklace switching. See #58