Fix #13: Some modificationss where missing from the last commit 65a332dff3057d80c9a6c523b47ef6c96ffbc0e1