Properly handle $s