Fixed for latest version
updated to make it work