Reverted to version 46