Bugfix for saving to *.p
Bugfix for saving to *.p v2