HUB-250: Bug Fix with linux interfaces