Test for #503 added