Partial fix of issue #32, months working now