[SRC] Closing bug #7