Fixes handling