Have you tried the latest 2.2 GIT release?  Many code updates

alan