suggested fix for iss8 by 'daurnimator'