Partial fix for issue 48