Added dirty fix