Fixed (?) #43