Issue 152

Fix #152