[#1] just a temporary fix to stop internal server errors