bad bug fixing. still not 100% convinced these are correct