Proposing solution to BUG030.
Proposing solution to BUG030.