Another one of JOEY's bugs fixed