New fix to the annoying bug, which doesn't break everything