Bug fix for SNOWDROP-58