Resolves issue #110, infinite loading cell selection crash