Dirty fix for matrix having the wrong scope

This needs to be adressed in 2.1 in a proper manner!