Fix previous commits #5 and #19