New version after fixing #2