resolves SPOT-1835