Fixed GIS regression caused by force_subq

Caused by commit 7737305a4f5dc5006d92dac3a61523ad6c2a523a