Issue #249