nasty fixes