Extension bug fix