[3.0] Fix #297