fix mantis 6554