Fixed bug introduced in #84