Emergency fix to possible bug