Fixes bug in unzip logic