test and fix PSH/POP (contributes to #9)