Previous commit bug fix