major fix v1.2