Modified settings to solve bugs