Fixed issue with haste samba/haste