Fix for the dev mode