commit e227f54d01d29629d1f889118e8d3442c8640625
Author: Leo Balter <leonardo.balter@gmail.com>
Date:   Wed Mar 6 12:39:58 2019 -0500

    Fix assertions previously not reached before
    
    Fix #2049
