Issue #248 fixing story