Add fix for @werker issue #424