bugfixes to prev commit
Juan Batiz-Benet authored
555bc871