think just managed to make things work correctly with dynamic loading, still need more testing...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>