fixes #907 and fixes #908

Pretty simple.