removed buggy hack