fixed bugs with new prefix