fix this on 3.1m5 for now