Gets rid of the issues with the cyclic dependency or detached location.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>