OS-X dynamic device fix