ALPHA VERSION: Fixed bug relative to some import