Easier Q import for issue 54