Removed Jakes new code that caused problem