Fix for the fix of the previous fix. Fixception!