bug fix for behaviour