github tickets #112, #129, #130