Adding wrapper
prefix: bugfix