Fix/3.0/issue678

fixes #678