Wiktor feature request. Fix #9