Possible Fix for Spacebar & Enter error

Fix attempt #3