fixed to make work