... and now fix the issue myself. #650