Fix #43 - Add private unshift switch