remove buggy fixed function