Implement comment as suggestion in #112