Is there not a plugin that helps to fix this?