BUGS removed - solved