Partial fix to #1328