added noautoload
fixed conflict