Related to tickets #98 and #107.