partial fix to #132