Fixed bug with 5.10/5.12