first step bug fix #6