Specifications changed after fixing #1200