Fixed Hitman Bug

Fixed #1580