Fixing call order