Fix for legacy projects