Bugs soved by Peter Hristov.