Proper fix, hopefully.