Temporary fix until the real issue is solved.