Bug fixes: check quote