resolves SPOT-1338