this should solve #22