Issue 195

Fix #195