Fix bug with new gem features