Issue7 fix