Issue #252