resolves SPOT-1404