Last fix for gems