trying to fix #2 and #3, but #2 is still not working, will see if #3 is fixed...

Signed-off-by: jmlucjav <jmlucjav@gmail.com>