FIX: removed references to this from static functions