fix ticket 564