further work - fixes #14