Fix wagon issue