Fixes issues with previous fixes not fixing things