fix #1737

and switch "jodav" to "bux578"