Solved Issue #260 in a better way