Fixed an issue that my solution to precious issue provided :)