integrated the return view. still get an error in pdf creation.
Opened an issue for this (see issue #252)