Fixing parent / current bug