Proper fix