Partial fix for issue 131