Fixed bug that for some unknown reason didn't occur before