Fixes #170
Fixes #174