Maybe fix a bug..