Fix for the build error that sometimes happends