Switched order of dependency to try and debug #138