Hopefully fixes problems