minor refactoring issue fix