Minimize patch by Roman's review. #26