Fixes PR102 and PR119.