Improved #191.