fix for BUG 596