bugfix for framwork