Fixed small bug, Fixed #60