Bug #509