removed bugged version