Fixed entry bugs during lunch