fixes/gem-independency