[0.1.3] Wrapper and positioning fix