Fixing red border issue #3