#557 test fixed