Add testcase for #555