#43 remove bug code