fix to support 2