Fix for latest solution attempt