1. further bug fix