Better Fixes #1465