Partial fix of #61