Provide a better work around