addressing #1250