Fix for bug introduced in last version