Made support for quotes better with some hacky code