resolves SPOT-1741