* finally a working fix to #22