Close #840; Close #437
OMFG