Fix #105: No more workaround!