Fixing behavior on receiving small messages