fixes #126, fixes #128