Fix #138, maybe...