Improved #467