Fixed Bow and Polish Bug