Void Goat Fix #551