Fixed mentioned bug