Stable 1.0 issue 1654