Fixed for #175