Finally fixed gems