#554 test fixed