Issue #151 Fixed clumsy way of passing the frame pointer.