Fix #21 - Common override