Partial fix of #80