bug fix 1. attempt