Fix #556 (minor regression during 2.5.0-SNAPSHOT, not included in any of released versions)