Applying corrections suggested by @kalabiyau