Added check for fixed bug