Removed quick fix 1 & 2