robin's bug fix