fixed a bug... A new feature to come out soon