Fix for futur issues