Prevent circular function calls
v0.2.4