Bugfix for (#21) and (#13), handle quoted instances