FIXED

Bug fixes