Proper fix?