Fix for options/settings