bug fix...or hack lol