Previous commit bugfix