bugfix for all.one