Fix #1: Change static calls to self