Reverted to version 41