resolves SPOT-1311