Fixes #24 part II