Fixes setting issue