Fix for Ubuntuism, issue #14