Failed attempt at fixing issue #1 and #2