Re: #149 - Updated the hidden logic