fixed entry bugs