FIX: Make compatible with non dev version of 3.1