fixes issues tokiko pointed out