Should work with latest stable version