Fix unsafe decoding in indef case