Bug fix

- Another attempt