Attempt to fix #25 (10)