Quick fix for Windows, does not support on-demand