Resolve circular dependency bug and compile gem v1.14