addressing #1147