fix ticket 565