Fixed an issue introduced in #19