Added workaround for isEmpty SS remap bug. Fixes #1487