Quick small fix for v1.5