1.104 - cleanup fix