[gh-748] Closes
#654
again.
#654 (closed)