#26 run issue with previous refactoring