Fixing bug https://freedcamp.com/MaxWP_yPh/CU_PROJECT_47n/todos/1886726