final, fixes #1

first try