improved bug fix to take less code