Complete the bugfix