Issue 231

Fix #231