Fixed bug with thunkification