Q10 compatibility. Close #52