- Fix for previous patch