removed quick fix from marcus