Hopefully last update of tapkee before release