[f] fixes #16