Fix ticket #924