added hack to get rid of incorrect package names