Implemented second case fix with hash