fixed #291, for now at least