Fix #5

See also #5