Solved Issue #40: