Hopefully fixes dependency issues