resolved issue #2 for new v1