fixes

thanks to deedwar!