Another attempt at fixing STATE without breaking stuff

- also found a bug in FBM+ that I thought i had fixed before ...