fix issue with inlining of current-implementation
fix potential issues with current implementation