Quick fix for ST3 compatibility