Last commit bugfix