Workaround for 'g' delay