Bug fix for SNOWDROP-60