partial fix for http://jira.efficio.us.com/browse/GCP-6895