added 11.4 plus small bugfix