Bug Fixes broken expected and actual (#409) (5b7254c), closes #497 revert #407 and #409 (#412) (1009653)