some really annoying fixes