Entry bug fixed

Appears to be working correctly