0.1.2 version merge fix