Fixes second issue for #1221

#1230 fixes first issue. :)
Fixes second issue for #1221