Some very dirty bug fixing
fix shit