Resolve Issue#67