Fixing bug with the skip solver and solution handling in gap filling