Issue 182

Fix #182