Fix GMs + addition