Be compliant with new shorty version