Issue 236

Fix #236