Updated to be compatable with v3.5.5-1