Fix bug, thanks to Marianne