fixed an issue with enabled flag, setting it false everytime