Bugfix. Invalidly returned FALSE