Upgrade to 2.0.0pre5 and fix to allow pre suffix