fixed issue found with bug handling