Bugfix in get_machine