recurrent bug fixing