Swap that behavior; fix #408