Fix of collapse - again
Merge branch 'master' of https://github.com/dma-dk/Embryo