Fixing the sink behaviors