pr #1

8b9ec6d0fee31faf83a9b3075948c43264eeeb78 fixes #3