Yet another crappy fix