Added @atlefren for bugfix in #776