Mirelsol's fork

Created to fix #issue