Feature/en 1889

Also, whitespace on line 28 vs 29