Implement Rick's initial fix