Another bugfix, #952