annoying and ugly this is

bug fixing