trying to fix bundle behavior