Fix for the compiler errors in issue #13