Partial fix to #55