Prevent circular function calls
v0.2.4
Merge with v0.2