WIP: Try to solve #461 with FrameworkRestrictions

First one looks like bug