#544 tested