Last commit with bugfix