This solution does not work for version 2.1 and higher (beta)