Fixed #19 by duct tape approach