Fix for changes in habanero base