Vadus/fix create app