Fix double typing problem