addressing #1259