Fixes issue #27 remove is_active