Fixes #121, Fixes #120