Fixes stability issues, probably due to a bad merge