Fixing extension (to be changed later)