This is probably acceptable work-around for now. The matrices should however be changed to accept also zero shapes...