Fixes #16
fixes #18