Bug fix: wong conditional check... too shorthanded