resolves SPOT-1346