Fix for bug on valiant