Re-fixed bug