Issue 245

Fix #245