Really fix property file loading this time