fixed bug with false return