Issue 159

Fix #159