Another try to be compatible with 1.2