fixes #861 and broken common