Fixes partly #8