Fix extension
Merge commit 'f9c8687222d85fdf829c8b6802f5cabe67ef2b3b'