Fix for Project60#126 and Project60#116