fix for 595-37