adapt framework issue/#438

fixes #438