bug fixing sprint 2