fixed & refactored print-call handling