Better handling for PC var