fix ticket 578