FW-131. Same fix for linux