some fucking fixes