working driver fixes #2