Missing changes for issue #39. oups