Fix type juggling