References #167, fixes.