update models: fix #514 for real this time