i'll submit as a separate PR