tmp work
making safari work again.
handling neg. cases