Fix #165

Issue #165