BUG: Fix last commit bug