Fix entry error... should add validation