Improve reproducability