improved behavior for snowflake