Fixed #69. Partial fix for #74.