fixed incompatibility to 1.6