update PR as suggested by @Raphy