Partial fix of #23