Fix for strange errors